auto merge of #1060 : alexcrichton/cargo/pr-1012, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 18 Dec 2014 01:50:48 +0000 (01:50 +0000)
committerbors <bors@rust-lang.org>
Thu, 18 Dec 2014 01:50:48 +0000 (01:50 +0000)
commit5af754dc3fe508fcdb18d66d9647efd68807bcc7
tree207564a194f4c3f35feb1499b0c886a0d72b22eb
parent666fc50e0fbfcef4a1b486084c60eb883f61f964
parent8b7b67546ed07ef60faad7ba3ae5b5429cdc61bc
auto merge of #1060 : alexcrichton/cargo/pr-1012, r=alexcrichton